[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am:...
[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: 853f5c9e am: f8e1fca1 -s ours
am skip reason: Change-Id I670345494abbad80dacab54471e635abfae3b3b3 with SHA-1 bd67bf86 is in history
Change-Id: I31b8631bc160a6397579c6734445b42c738188f6