am 3b1d953b: Merge "Force dx compilation target to java 6."

* commit '3b1d953b3d5366bd550335ad373ed354067d85fc':
  Force dx compilation target to java 6.