Correctly sync only needed changes from CM

This commit, when combined with my current build environment, results in
a nice, working build of PA for the evita. Hurray!