Merge "Revert^2: Greylist com.google.vr.platform hidden methods"