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

Change-Id: I410e801c7ddfc08c4080d2bf166b1c622887e535