fix up build errors with VZW with added mvp folder to comply with -a15