am 6e5e160f: Merge "Make layoutlib load on Java 7 VM"

* commit '6e5e160f19c404c272e70f7f0ade5b27850ebd05':
  Make layoutlib load on Java 7 VM