Merge "dumpstate/Android.mk is converted to Android.bp"