am f9335c1f: (-s ours) am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread

* commit 'f9335c1f23270b0b0d2649f6a95fe7f4cc0422ee':
  Asset cleanup. DO NOT MERGE