Merge "Camera2: update aeLock and transform matrix tag specs"