Merge 6f7bb5ada1a1144949e23b7057ad2d97cc3894d9 on remote branch

Change-Id: Ic66276a6ad12ea0cfbc7376e2eb32eeaca031600
tree: 67ae8800434a390fd9c727ae2094d2b724b602a6
  1. generic/
  2. SEPolicy.mk