[automerger skipped] Merge "Platform shouldn't directly link to jars in APEXes" am: c1b762b97d am: 0902172e9f am: 918344d411 -s ours
am skip reason: Change-Id I251fabd773bc31f46d572d143c72dd9162f3f0a6 with SHA-1 489e09abae is in history

Change-Id: I144222402d5c4c49fc8cbd581211b45335a28781
tree: 4eafe6163e39f85db9b322c97c767fc0de023e41
  1. Tethering/