Merge "Camera: Look up client name for NDK earlier" into tm-qpr-dev