Merge "Improved test cases in MediaRecorderTest.java"