am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build