am 842a2606: Remove unnecessary java version check

Merge commit '842a260610794dbd970cc770784f9aa0ccb2f2e6' into gingerbread-plus-aosp

* commit '842a260610794dbd970cc770784f9aa0ccb2f2e6':
  Remove unnecessary java version check