Merge 7cc34529cd52b1522ed60497437851758312c066 on remote branch

Change-Id: I9a2ad72f0a94585cc7bdfb21e8eabed57b066357
tree: 330568278f9a7bf38c2149843cc193d0d72cf765
  1. Android.bp
  2. cryptfs_hw.c
  3. cryptfs_hw.h
  4. NOTICE