Merge "Make the rest of libdex and dexdump LOCAL_32_BIT_ONLY"