am 38cb1b89: Merge "Add directories for OBB mounting" into gingerbread

Merge commit '38cb1b898c048a5f562c5a2381ec0310f020a587' into gingerbread-plus-aosp

* commit '38cb1b898c048a5f562c5a2381ec0310f020a587':
  Add directories for OBB mounting