Merge f9714cd55d54e4e8953d01960679d4d6f6fae173 on remote branch

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