[go: nahoru, domu]

Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.081'

 Conflicts:
	mm-video-v4l2/vidc/common/Android.mk

Bug: 127924739
Change-Id: I14cac21c823feb61b413276f4ec61d9a89bc55a5