Merge "Filter ANDROID_PROPERTY_WORKSPACE"