[automerger skipped] Merge "Convert data/etc/Android.mk to blueprint" am: e35f702749 am: 5b8ef0a129
am: b16e2c7ed3 -s ours
am skip reason: change_id Iad06f3efc727d97bdef3d4a7cec9b2b1fbc775b9 with SHA1 8fe7b41bc9 is in history

Change-Id: I56fe432aba1ce52273c23f2fac0b8ad95fb9047f