am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev

* commit 'b72cdbdc8cbd3c146ac62e0c6831adba656681e5':
  Fix MediaRecorderTest failures.