Merge "Remove symbols which we did not expose before android-23"