Merge 007fd2fbe2ded6956fce8b2e3491d7672098c695 on remote branch

Change-Id: I3ef348a4766b0ddb46cdfbbfd7578174b8c1c540
tree: 1328ffec1661f681a7980a1e6c8df7e0ac7d9173
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk