Merge "Camera2: Deprecate EXTENSION_BEAUTY and add EXTENSION_FACE_RETOUCH"