Update make command forward into vagrant

The newest versions of vagrant setup the www-data user with /usr/sbin/nologin.
This prevents our current method from running scripts inside vagrant. This patch
updates the way we run as another user to workaround the nologin setting.

Change-Id: I4deaeeda22dbb5ad20c61ca76207a8e4f1b8f682
Merge "Update make command forward into vagrant"