Merge "dumpstate/Android.mk is converted to Android.bp"
am: da154d466f

Change-Id: I3639f9bebefcb88f34041b7d1574f047271e4e8f