am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."

* commit '6393875024e3b2ee6916d718d79dfbeb722537c1':
  Fix layoutlib build.