Merge "LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP)." into nyc-dev