Revert "aapt: honeybadger past overlaid values missing in base package"

This reverts commit 101230c743ca18a494b818a51ca6199da00d2aa9.
Reconcile tools with cm

Change-Id: Id2a8867639133eb81b5e71224b6bef978d03526d