Merge "Fix a build error reguarding build_sepolicy"