am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread

* commit '976647841cc9e52c373679c930d06d81310ff289':
  Asset cleanup. DO NOT MERGE