Revert "temp. rename 'max' values"

This reverts commit 1b6379d3e1043413d1421da5b8e2b803d995480b.
media: Increase media volume from 11 to 20, picked from alviteri@6b2c2baed57cd5aba84393e51e7e7aec9c1dde59

Change-Id: Ic3284a170f59094f936380cc9bdfd91ba1462581
storage: allow swapping primary storage for apps

Advanced storage settings patch series:
[1/4] vold: allow swapped storage paths at vold init
      http://review.cyanogenmod.org/56515
[2/4] Advanced storage: vold swap storage paths
      http://review.cyanogenmod.org/56516
[3/4] storage: allow swapping primary storage for apps
      http://review.cyanogenmod.org/56950
[4/4] Advanced storage: swap primary storage for apps
      http://review.cyanogenmod.org/56951

By setting the persistent system property
 persist.sys.env.switchexternal=1
the primary storage device returned by getExternalFilesDir() for
applications will become /storage/sdcard1. This environment variable
change is effective on devices with either emulated or non-emulated
primary storage.

Change-Id: Ie091eb632280c2dbfd00bbf5f9b0b09be0239234