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

Change-Id: I66762a89ce2e06988b78d32967392936643933b0