Merge "Convert development/gki/Android.mk to Android.bp" into main