Use default build parameters

Change-Id: If56d56c53ee1c83b7517dba9e5d822e993af4b51
(cherry picked from commit 38235a36f8a3790f1bb21b43418dbb058aabe625)