Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: 3f83f1ca8f
am: da0ea36c5c

* commit 'da0ea36c5ccac34e982be036b751a61806d613ae':
  Remove ANDROID_PROPERTY_WORKSPACE