Merge 78cdf4bb36b1e58da1e54620a3de8311f785f075 on remote branch

Change-Id: I33c30072b348e93af4791b6f90b1c0e565ade64a
tree: 4526bde1807c0e626da2ce8e9c3bbd0fd5510bf2
  1. Android.bp
  2. cryptfs_hw.cpp
  3. cryptfs_hw.h
  4. NOTICE