Cleanup Manifest After Merge/Track CMDev Linaro Upstream