Merge "Dedup stub jar build rules" am: e20dcd3c8d am: d2a895ab45

Change-Id: I47231fa9a3d1ab58593b4db5b07f4546e6c07c94