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

* commit '343affaf7dab7f251915aaac41472d5028e87d65':
  Fix layoutlib build breakage