Add x86_64 to flavor arch options

Change-Id: I3a17bbe150eff35a4a3c9487e9bbce427a2d8a07
Merge "Add x86_64 to flavor arch options"