Merge "Convert data/etc/Android.mk to blueprint"