Merge "Add LOCAL_SRCJARS to clear_vars.mk"