[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am:...
[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: cba45b28 am: 4f2eeaba am: 5df94fa4 -s ours
am skip reason: Change-Id I670345494abbad80dacab54471e635abfae3b3b3 with SHA-1 bd67bf86 is in history
Change-Id: I1be70f8919c1c057f91ec8146745a5bcba1a72e9