Merge pull request #12569 from cctuan/922462

Bug 922462 - [Flatfish] use 1.5x icon from manifest for tablet(cherry picked from commit 3c3eda6d93d7329f437b71d03c3d28353f1f3d4c)
Revert "Bug 922462 - Define various size of icons in manifest instead of use buildscript"

This reverts commit 32153515a3eedad26aec89322e02934a0dc06a0f.