Revert "[Android] Update the field parsing of icons."

This reverts commit 934d5d1f4c8633a464329bd2b33ba2006acd1794.