[automerger skipped] Merge "Dedup stub jar build rules" am: e20dcd3c8d am: d2a895ab45 am: 316f8dab7c -s ours
am skip reason: Change-Id I90292cafaac1dcc64d642db072ce4880fcdb87cb with SHA-1 08b48bb91f is in history

Change-Id: Ie3022c38848c0d8a310aec149a74823d25baae5c