Switch to AOSP checkpolicy again