DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio"
am: 3599745287

* commit '35997452876b7ec164534b5267535076597495cd':
  DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio"