Merge f9ddb744de137f8acfb5807e24c095c79c67f910 on remote branch

Change-Id: I3357d7ab5bd4bb6025cb3d3fa6c61b48af411267
tree: 35893babb28364b33ee08e4948791ababfc30c46
  1. Android.bp
  2. cryptfs_hw.cpp
  3. cryptfs_hw.h
  4. NOTICE