Merge "Remove ANDROID_PROPERTY_WORKSPACE"
am: c68998441c

* commit 'c68998441cdf32159912704fdd264b4750390012':
  Remove ANDROID_PROPERTY_WORKSPACE