Merge "Revert "DO NOT MERGE: Convert android.mk to android.bp for car-apps-common."" into qt-dev