am 9c0f2df1: Merge changes I5a3584b6,Ic7252a8e,I2d4ace75

* commit '9c0f2df1832f82bd2867d2e2fa18dde31b05e63e':
  Various minor policy fixes based on CTS.
  Split internal and external sdcards
  Give sdcard sys_admin capability.