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

Change-Id: If22a3b766783a5ccf2731cde5792c711268290e1