am 1028c4f0: Merge change 2184 into donut

Merge commit '1028c4f04051f95fbb4fd9120e7ab1cf43462bd5'

* commit '1028c4f04051f95fbb4fd9120e7ab1cf43462bd5':
  cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.