Revert "fix jewel+m4 sync"

They still haven't all successfully lunched since the villa change. Try lunching all of them and figure it out, or ville is going back to cm, like when they all synced without messing up the bottle service local manifest.

This reverts commit fde01ee2b024e5e1b52e54a023280d76ef65b3f9.

Change-Id: I888621f6e30f2c2e7ba7609bf51e3ad83dfe0c5a