Track own system/vold

Change-Id: I5a3ec641dcb376d0ae249e5e0bbf73c5c9558e35