Switch some back to AOSPA-legacy