Merge "versioner: don't require mips headers." am: 1cecce883a am: 7d190be029

Change-Id: Icd44884407b5a3cf541d238f24238bad0199840a