Merge "Convert cmds/device_config/Android.mk file to Android.bp"