Merge "NuPlayerSource: clarify getFormat API and fix its usage." am: aeaa5f825c
am: bed2c85b57

Change-Id: I60eb1ef00366a8196a8355ecdcdb7fadba4685e9