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

Change-Id: I0ca9919004e299c41f5e273ea30d7acb48512ec0