Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c
am: c64de373c1

* commit 'c64de373c13183c424a2a27c34f45311328374d5':
  Remove ANDROID_PROPERTY_WORKSPACE