Merge "NuPlayer: return error when neither audio nor video source has...
Merge "NuPlayer: return error when neither audio nor video source has metadata." into nyc-mr1-dev am: c486e134 am: a14b0e4e
am: 8a53bc02
Change-Id: I5ce87ba4f0e40c2f84252592cb2d8ef5f81c30bd