[automerger skipped] Remove markToFwmarkString() am: ad315c9d am: c839c91f am: 7858e69e -s ours
am skip reason: Change-Id I448c6487e5787c6dd0466ac76c80900ccd3b7249 with SHA-1 17bb79ae is in history
Change-Id: I7ba7a41b054d7034b1a9d7136a745da0e5ff6fa9