Merge SPL-2020-03-05

Change-Id: I57ddcc1c4878565a0fdabc645ec2d4b77c940182

generate-packages.sh

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