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

Change-Id: I246507d0f764fa18e864378e29104663649ad765