Add back viper4android

Edited so launcher icon is removed, will re-add settings portion soon

Change-Id: I5512d57972ea7a710c45829adb48c83f39961b18
Merge "Add back viper4android" into lollipop