Merge "Execute test.sh within build.sh" am: ef4b2af369 am: 67d3c86e83
am: 2e3adffb89

Change-Id: I8804684ef235010fe11fcfddb0b605084f609d1f