Merge "dumpstate/Android.mk is converted to Android.bp" am: da154d466f am: 777b3a4faa  -s ours
am: a147449f07  -s ours

Change-Id: I7af1f4033582ac6c0d33b41f48917c194c1a0f73