Merge "Remove ANDROID_PROPERTY_WORKSPACE"
am: 3f83f1ca8f

* commit '3f83f1ca8ffdfc99b6e7c8bf5faec26b0f18bd33':
  Remove ANDROID_PROPERTY_WORKSPACE