Fix mountpoint parsing

 * Not all systems follow the assumed format. New kernels do not
   include the "on" and "type" literals, and do not place
   parenthesis around the mount options.
 * Detect these conditions and do the right thing.

Change-Id: Ib88edf049e6a42cdab26274202f09de2bc19b493