Merge "Dedup stub jar build rules" am: e20dcd3c8d

Change-Id: I085a44ce5d2b0dee920dab158551a6c90a8d1f31