motorola/ghost-common: hijack cleanup

Change-Id: I19ddb48fa803c3c448c9f1f2c3cac08635c36f92
v3.64

Change-Id: Id38c491207bac6d2888462477340d6c3b39856f3