Merge "Tidy resources related to app branding." into arc-apps
am: fec6f3c47c  -s ours

Change-Id: I6a081ee4059ca29d959c0e0c1d2ce3cccaa4f9f1