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

Change-Id: Ib95c950f13747a8476bcf9fb5876acab892d75ee