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

* commit '5310a98fcba72f0b32bb866eb293a342df5f9e70':
  Remove ANDROID_PROPERTY_WORKSPACE