Merge "Add fake libart" into nyc-dev