Merge "65xx: Minimally refactor Android.mk"