Merge "Added more test coverage and a test case for MediaRecorderTest.java"