Merge "Re-order rules to match AOSP." into stage-aosp-master