am 40d0ac25: am 27e476b3: am ef8b550c: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726

* commit '40d0ac250ca8c438a389cc664210c5eb3620af7a':