Merge "Convert data/etc/Android.mk to blueprint"
am: e35f702749

Change-Id: I7f9837f0d2598170076f95d7a7cc48bfd8906519