am efa617f9: (-s ours) am 15994863: am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit 'efa617f9fe4cbf5449d735118bf39fcfbc1dbf74':
  Layoutlib tests now check methods return value [DO NOT MERGE]