Merge "Suppress implicit-fallthrough warnings in mediarecorder." am: fd53bf2f59
am: 5c1de015ad

Change-Id: I518cb9e4a74c9b7ba335a2bbb6a53b81c7661ca6