am 8eec26e2: am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."

* commit '8eec26e2765d6e83f8509beb610caef936a11a35':
  Move goldfish-specific policy rules to their own directory.