am 1f2e52f3: (-s ours) am 7c729d85: (-s ours) DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility.

* commit '1f2e52f3c486abd1719a89c2de40f4e638a823b8':
  DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility.