Merge 984c09ecd99eca20ba190eae9fcc36640a728c33 on remote branch

Change-Id: I69308fae8d90623097033ba633d01b5587e4576f
tree: 93118cd85deddd057363c7bef4adbb52d90d1851
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk