am 022fd57a: am 343affaf: am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev

* commit '022fd57acb9d99e58868c0b319e572a9765f73cb':
  Fix layoutlib build breakage