Merge "Allow overriding the compile SDK" into pi-dev