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

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

Change-Id: I80bfa4cc735e73afe200b501add90135ac893e53