Merge "API changes requires for Bluetooth apk inside the apex to build."