am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev

* commit 'ce393373b73e1a1f30ce9bb41568d415cab7df49':
  Fix layoutlib [DO NOT MERGE]