Port to qibuild 3.2

Change-Id: I1f81e1115bfda709b49171b07741dc769dff631a