Pin support libraries to Java 1.7 so they can be used with dx am: e1cd5a1f80
am: d8d2289aef

* commit 'd8d2289aefdb5b7d9878ac37613495889fb5c3fe':
  Pin support libraries to Java 1.7 so they can be used with dx