Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev