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

* commit 'dc016b7303d82f09beab23970c943f79f9efe4d0':
  Remove symbols which we did not expose before android-23

Change-Id: Ia7c1d3e85847ba5dc326c83e276b953e6d3ed4c9