Merge d06f611f1e51d22c050d121eead41ab23e22991b on remote branch

Change-Id: Ic33d849e9b08d02f1d19791fd7b66b75e440b724
tree: 32443797429c425972c30e44c448506064259df1
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk