Merge "Remove android.frameworks.bufferhub@1.0 from the Framework"