Merge d6aaac10 on remote branch

Change-Id: I77a31d1d2f677b9e902c910c69a07d3785565481

generate-packages.sh

@@ -153,12 +153,9 @@ do
     mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE}
   fi
 
-  if [[ ${COMPANY} == qcom ]]
+  if [[ -e "${MAKEFILEDIR}/Android.mk" ]]
   then
-    if [[ -e "${MAKEFILEDIR}/Android.mk" ]]
-    then
-      mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/
-    fi
+    mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/
   fi
 
   echo \ \ Generating self-extracting script