Merge "Camera2: Migrate to new storage API"