am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"

* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir

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