Merge "Add LOCAL_SRCJARS to clear_vars.mk" am: edd5f3810f am: 7ae502ff64
am: c6bbdc86dc

Change-Id: I2723a01758445c63d4ce77281d3d6efeb63c5523