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

Change-Id: I0b2482ce7ac9fa7132837d811c264e62dbbfc0d6