Merge "AAPT: Render resource ID values with 0x%08x in "dump xmltree" output as is done elsewhere."