am 154dfff8: Remove unnecessary java version check

Merge commit '154dfff8766839d10fbb3311555338f3b9f0c774' into gingerbread-plus-aosp

* commit '154dfff8766839d10fbb3311555338f3b9f0c774':
  Remove unnecessary java version check