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

Change-Id: Icd4415f8c912dde2e9ece644f16fae310aa15a8e