Merge "Fix makefile error with ANDROID_BUILD_TOP"

Android.mk

@@ -182,7 +182,7 @@ $($(MAC_PERMISSION_FILE).tmp) : $(call build_policy, $(MAC_PERMISSION_FILE))
 
 $(LOCAL_BUILT_MODULE) : $($(MAC_PERMISSION_FILE).tmp) $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py
 	@mkdir -p $(dir $@)
-	$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(ANDROID_BUILD_TOP) $(mac_perms_keys.tmp) -o $@ $<
+	$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $(mac_perms_keys.tmp) -o $@ $<
 
 $(MAC_PERMISSION_FILE).tmp :=
 ##################################

keys.conf

 #
 # Maps an arbitrary tag [TAGNAME] with the string contents found in
-# TARGET_BUILD_VARAINT. Common convention is to start TAGNAME with an @ and
+# TARGET_BUILD_VARIANT. Common convention is to start TAGNAME with an @ and
 # name it after the base file name of the pem file.
 #
 # Each tag (section) then allows one to specify any string found in
 # TARGET_BUILD_VARIANT. Typcially this is user, eng, and userdebug. Another
-# option is to use ALL which will match ANY TARGET_BUILD_VARAINT string.
+# option is to use ALL which will match ANY TARGET_BUILD_VARIANT string.
 #
 
 [@PLATFORM]