Merge "Remove setCounterSet and deleteTagData support from libcutils"