Merge "camera2: Fix ABI for new tags." into mnc-dev