Merge "Add TARGET_2ND_ARCH support for dump-oat-boot"