msm8974-g2-kddi-camera: Merge from LGL22( G2 )_Android_JB_LGL22_10a_Android

Change-Id: Id0ddf509473404b156184b2ae73d03dd03b08f71