Merge "Do not compile vm-test at runtime" into oc-mr1-dev am: 73e269647d
am: b5db614e55

Change-Id: Ic8255b0336ec103a0ddf1ffd7a328f2cf1e57165