Update assets. Rename some of them for consistency

Also removes unnecessary assets

Bug: 5286981
Change-Id: Icdea22a294d11c48853d8979367db05eb2ba66fb
53 files changed