am 5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""

* commit '5496bbf6a3592fd99cee6b8c20c8624c2aeea0c1':
  Revert "Filter ANDROID_PROPERTY_WORKSPACE"