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

Change-Id: Ic5190c570aca78722ded01795d1ab87f1dffc27f