Merge "stagefright: parseApp check data boundary conditions" am: ea73e1aef0
am: 046ac31f1f

Change-Id: I31065509366a84f2f1bfd90ba1c3d9b3d91aa1bf