Track system/vold

Change-Id: I76446f0156294d36b154c11b7d087b21bd1408f0