Merge \\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\" into klp-dev am: 91ad8847ab am: 74b10b831c am: 6bdf8cb440  -s ours am: 1f5fe85d74  -s ours am: 67443ebc81
am: 12165c481f

Change-Id: I97c5746a61515aefdb065f9d6a9ce3f9281999cb