unbreak the build by picking in the fix from bryce.

apparently the patch I60ba89b4 in bryce works around a known issue in aapt.

Change-Id: I0468270273350654239be93ef6346d531951f778
2 files changed