Android m preview
Merge "Fix x86_64 issue with a missing "." in structure names."