Merge "Suppress implicit-fallthrough warnings in stagefright." am: 70f03120d7 am: fd38163d8b
am: 35b3099472

Change-Id: Ib35c96989eb80b612e2cd7a6a8798ed6db393ced