Maintainership updates

Change-Id: If158e51440d7cfd674d779909e419f5139ff7d27
Include WhisperPush with CyanogenMod build

Change-Id: I63fddfbc144cd8d8dbc797dc87d0897345bb0f79
Fix merge