unify ap_ap10 and apD10_ap_*
Merge pull request #449 from mikeshulman/ap10ap

unify ap_ap10 and apD10_ap_*