Track CM's system/vold and bootable/recovery

Change-Id: I51193adcb40e86826dba2f81e2611446f0c0cbfc