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

Change-Id: I875cb7bba1bc6f6f443923a04629ae44a9d41140