Manifest: Support xwalk_description and deprecate the old entry

Added a new FIXME's as well.
Merge pull request #2256 from kenchris/xwalk_description

Manifest: Support xwalk_description and deprecate the old entry