Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev