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

* commit 'f246ae984baa133b93af4e14f94ba35990b43dbb':
  Revert "Filter ANDROID_PROPERTY_WORKSPACE"