Merge changes I3c14cfcf,I9d2ea66c,I9930105e

* changes:
  Replace library headers with angle quotations
  Reorder the include directives in cryptfs.cpp
  Add linux/types.h to cryptfs.h