Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master