Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds" am: 2f9b9f0938 am: 8156e82fa7
am: 26f8ac9a42

Change-Id: Ibb851a9fa1794e60354957c14ed3e95abcd968e5