AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.

Automated import of CL 147028
4 files changed