upstream: use master insted of fix_tests branch

Change-Id: Ic8e9cafa8f4a2a424c546997e2c357791636049c