am 80eaaa0c: am cc674300: am 35b84b28: Overwrite android-info instead of appending to it

Merge commit '80eaaa0c280daf7123241966223608bab40d236f'

* commit '80eaaa0c280daf7123241966223608bab40d236f':
  Overwrite android-info instead of appending to it