Revert "This is a patch I've checked in in the old repo and apparently it was...

Revert "This is a patch I've checked in in the old repo and apparently it was not ported to devpde01."

This checkin introduced aapt changes to build on the device, which are no
longer a required part of the flow.

This reverts commit 30f0b7ea.

CR: Sergey Ten