Merge changes Iaed1cd6b,I681c1e97

* changes:
  Revert^2: Greylist com.google.vr.platform hidden methods
  Revert^2: Start using new list of non-SDK APIs