Merge "NuPlayer: Do not account eos frames in dropped-frame-counter" into pi-dev am: 0bb94af9e8
am: b33e0b0720

Change-Id: I5e02f4c490c0f7fc2a3021177c3f97e1a3badd2d