fix: derps and Track our own vold

Change-Id: I4ce2273ab687ca663c1c25aececeec1e682607f1
Merge branch 'kk44' of git://github.com/scotthartbti/android into default
fix derp

Change-Id: Ie1c68efad9cbce12bba0ce7f1039dccbd1e24e15
Merge branch 'kk44' of https://github.com/Team-Exhibit/beanstalk into default

Conflicts:
	default.xml

Change-Id: Ifc4e8d84cf5a280459d6d90072260d07d8bd9cca