Qcom Camera: Merge squash AOSP 4.3

Change-Id: I41d77fc11fb41a2c406532c3f92909cec5e0a08e
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>