Merge 5416350fd811df2b6dd5d4b3fc97160f4c0099ac on remote branch

Change-Id: I3a1d21ba5ae360d56d843d7a67b5efd90968786d
tree: 9a9b0717a1ffa12a8d17de324815b14bc256bb55
  1. generic/
  2. legacy/
  3. qva/
  4. SEPolicy.mk