Merge "Change libraries needed by layoutlib to "host" libs" into nyc-dev