Merge "Allow overriding the compile SDK" into pi-dev
am: fd5166ddac

Change-Id: I53d265b82f4a0e9b86b1324900e133911a355104