Adapt to aapt's newer output