[automerger skipped] Merge "NuPlayer2Renderer: support 8/16 bit and float PCM types" am: d19b646398 am: b2521645be
am: d4ece817f9 -s ours
am skip reason: change_id I95f9865e7cea00e57f3faebeefd5cd095736201d with SHA1 896b4d6dd0 is in history

Change-Id: I93a5c582610b55cd51f86fb5674a808a045388bb