build --thorough instead of build --clean

Change-Id: I0df2cafbdcaba6d02ab4398156a451302aabf574