Merge "Soong: Read Android.soong.mk if skipping Android.mk"