Merge "Merge "Get UnixFileTest running in CTS" into nyc-dev am: 79937564 am: dc815b50" into nyc-mr1-dev-plus-aosp