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

Change-Id: I20a563fb4d0695a1b4dd8781470a22c686f6dec8