Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c am: c64de373c1
am: 876c9c803e

* commit '876c9c803e399877bf7b0adc52e7a6e18d055d73':
  Remove ANDROID_PROPERTY_WORKSPACE