Merge remote-tracking branch 'origin/t6490_fp5_qssi_CS7_r31.2' into fp5-qssi-0330

Change-Id: I5a85917cc2f525f7607bfd51a1f7ebe46193ff1f
tree: 21b46544c04c6c2954af60fb18ce781301d6851c
  1. generic/
  2. prebuilts/
  3. append.sh
  4. SEPolicy.mk