Manifest clean up and reupload

Change-Id: Ie075976d05f44bdc344c537666523b3ff4a2183c
Track VoicePlus w/ dependencies and track my frameworks_opt_telephony(temp)

Change-Id: I3ed0735d4aedb141dc033fc16af175f31cf06544