Resolve conflict..

Change-Id: I72cf4036b5174b60111cf8e072bef96a1969ef15
Revert "lower audio encoder on video recording profiles"

This reverts commit 09eeaf572e440f10454f00878c5a657c64d07256.
Resolve conflict...

Change-Id: Ib989b39f71b50f8c0b3d36fdafce68a34ae4c647
Revert "add hostapd driver"

This reverts commit 2bff10a8bfdccfbf4e5dac537cd1c83173415b49.
Enable flashlight

Change-Id: I6ea1604f63c0086d88312979e81083b87f37ce7b
overla<: Gallery2-->Camera2

Change-Id: I1c31888b1dcd4fb1f4889876fb7568a42478fe86