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

Change-Id: Ifc061bf79cd7d0641da8209fee9c2a92dfd13745