Merge changes I28f35a1e,Ieb72dc88

* changes:
  libfscrypt: Infer flags at parse time and include in options struct
  libfscrypt: No need for parts-parsing any more, integrate code.