Merge "Remove res-560dpi symlink." am: 02986d381e am: 75dd6f652d
am: 19c17b101e

Change-Id: Iadbfe042a85237ce827464a8c83c49899729d10b