am 2f505efc: am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev

* commit '2f505efce02fdb19881603a56cf4544ea10eacd0':
  Check for microphone feature in video camera recording tests.