[automerger skipped] Merge "Allow guava to use java_host_for_device" am: 44d5d22d
am: 676f488b -s ours
am skip reason: change_id I012030cb701c01ea9ff554c1b6156d0242365a4c with SHA1 b5191a57 is in history
Change-Id: I7367bb0fe24d1829b31dd94803972f1183e7d582