am 5cb94751: am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

Merge commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b'

* commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b':
  Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS