Merge "Fix ERROR_MALFORMED return in bool method, BetterSniffMPEG4" am: 67b97497e5 am: 0ac1279131
am: 6319db1d31

Change-Id: I902489560f141c368636b63226e83d4f0af40976