Merge e1dd1dfb1a5d170645b8b5b49fa7f394ebb8326b on remote branch

Change-Id: I477d70924c2f7d6b9864e73972d0844a0d5a4501
tree: 3b44ad97ffa903a459afae87c7846de7686fe9f4
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk