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

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