am 54059cd3: (-s ours) am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev

* commit '54059cd38de24bbffc2525b56955535df73bf1eb':
  Replace LruCache implementation for layoutlib. do not merge.