VanirAOSP: Heavy metal development

PS2 - We don't do typos here
PS3 - For real this time?
PS4 - Replaced a typo with a typo... Retards all around

Change-Id: I9df9d99aa79715a66bc3c455258987cb8395e882