Merge e23cb1b7486c4d35ae7e195bc2193d29ac130356 on remote branch

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