am 14c7f36f: Merge "Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY"

* commit '14c7f36fc66bc4593c070792da9437b59b0e0cdb':
  Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY