am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"

* commit '1b34228bb289723c4ba0534eae57d0d085a3d0fa':
  Filter ANDROID_PROPERTY_WORKSPACE