am c445ed70: Merge "Make Layoutlib compile on Java 6."

* commit 'c445ed701ade87e5a15f161483fb0200ff5e3e4a':
  Make Layoutlib compile on Java 6.