am cf4fcc6c: am 5d3b7c0b: am 60f20393: am 8237115f: am 2029a017: am 3323726d: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev

* commit 'cf4fcc6c729e9e5bde38bd888298e94a5a4ad56c':