am 4d2a9ab5: (-s ours) Merge "DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility."

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