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

Change-Id: Ieb95c0c81bd8f5503e0162fc5ee2c7f2421612e7