Merge "Change libraries needed by layoutlib to "host" libs"
am: 709bf582cf

* commit '709bf582cf949680da976e3f6cd5bf03396b1db1':
  Change libraries needed by layoutlib to "host" libs