Merge "Clean up sdk building, use built xmllint"
am: 1d53d4e194

Change-Id: I47b57da8e4b73393387f899051c67561d7934fe1