Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""