Merge "ViewCompat shims for isInLayout, isLayoutDirectionResolved, setZ" into nyc-dev