Merge "Remove Android.bp logic from makefiles"