Merge "Convert Android.mk to Android.bp under redfin/dumpstate" into main