Merge "[vts-core] Make VtsKernelLibcutilsTest runnable by base TradeFed" am: 0852b10b37 am: 7315bc9175

Change-Id: If10e46a04c61d7f360a62ba1352cfb4eef9e468b