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

* commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4':
  Fix layoutlib build.