Merge "Revert "Build platform side policy with Soong""