am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
  The old clean target had bit rotted.