am 60a735fd: Merge change 9352 into donut

Merge commit '60a735fda1f9d7c24c577853304d486b0109632f'

* commit '60a735fda1f9d7c24c577853304d486b0109632f':
  ADT: fix PreCompilerBuilder to use minSdkVersion as a string, not an int.