Merge commit 'c6de663910836c814ee7d6b3583c5cabab26ba9a' into remote

AU_LINUX_ANDROID_LA.BR.1.2.1.05.00.00.029.013 merging to LA.BR.1

Conflicts:
	hal/msm8916/platform.c

Change-Id: I9ecef3195c37ae6e1b3cd754b6ec9a0c2b0bd191