am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev

* commit 'aba035d2ed4a0c39d59ca039b52af2bc3f5980b4':
  Fix layoutlib build breakage