resolve merge conflicts of f7b975c5 to qt-qpr1-dev-plus-aosp

Test: build
Test: Camera2 app take picture(sanity)

Merged-In: I4a697c1eaccc3603007be4a595febea981fbeb64
Change-Id: I8562c83478b1fe8fbda7c85f97b995985666918d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>