[automerger skipped] DO NOT MERGE: Add tradefed_java_library_host am: 4ba82c9482 -s ours am: afb18d1927 -s ours
am skip reason: subject contains skip directive

Change-Id: I3545df59c8eba8c0a40c0273fc4a5465867beb98