Merge "camera (v)ndk: Setup vendor tags if they're not already, while calling getCameraService()" into main