Switching to aospal's PC

Revert "slight change in AAPT"

This reverts commit b1aa2f01ed60be3ec9bceb7ff8dfdad262ab0b16.

Revert "add back omni's PC"

This reverts commit fe57b3df06f5a6bdf73f68b137f2cff231877308.