Merge "Adding prebuilt-sdk changes and framework-bluetooth jar for dependency fix until we can use update_prebuilt.py to update the jars"