Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab
am: 3c4401fce8

Change-Id: Ib6bd99193a44fbd801906d234c42b3fa3d33fb9a