Merge "Convert hardware/interfaces/keymaster/3.0/default/Android.mk to Android.bp" into main