base

Fix non-positional format strings

AAPT doesn't detect non-positional format strings across tags. AAPT2 does.

Change-Id: I9c517f714727e39f195f760816482b6e088cc5f6