Merge "Execute test.sh within build.sh"
am: ef4b2af369

Change-Id: I8f474248defd7fa16dec1845a2d8c60a8e0cc941