am 2e5b38d8: Merge "Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY"

* commit '2e5b38d83234ff5a9a068ab07e7c51187ecd81a3':
  Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY