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

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