Merge "Follow new type for compile_multilib"
am: a4d89d9bb9

Change-Id: Ice38c3de568ee206b4080f0467c25195ff9759d5