am 56ff8e31: Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"

* commit '56ff8e31cf8f979dae1b147810ef2471a6b68ad8':
  Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"