Android m preview 1
Merge "make mclinker able to link arm object on x86 (fugu)"