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

Change-Id: I5df14b63a50b1f2baa8c3442c89e5e47c038b8fa