Merge "Set up oem.img directory structure for TARGET_2ND_ARCH."