Merge f809e031faeecabc4568599d62227b1146155861 on remote branch

Change-Id: I473418420011ffade382df0d05e51ea03f212804
tree: 98f2623681b09f66094d695e6bfb1d94da21e686
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk