Merge 280a4bb7e16e5091cf301088a57ade0645e05817 on remote branch

Change-Id: Iafcf4935f2d737760b7f53d5f3338bdf4c202936
tree: fa8e1205651ba2b22e124f1f4c5b7822b56224a6
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk