am 19553241: Merge change I1314e737 into eclair-mr2
Merge commit '19553241' into eclair-mr2-plus-aosp
* commit '19553241':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.