Revert "Camera2: Migrate to new storage API" am: dceae19f12

Change-Id: Ibb1cebbf8707aa9f1e473dc4cca815b2ddafb915