Merge "Convert device/sample/Android.mk to Android.bp" into main