Merge \"Convert more Android.mk files to Android.bp\"
am: 4c06cd8634

Change-Id: If16db842b2a10ee328b2a8e30e12aeb0a5611e05