Installd: Remove string-helpers am: 6db8db9f33 am: d7d4d60340 am: 09e961000e  -s ours
am: 666e59b802

Change-Id: I267757c8cc2cfbc87dc51b192c060aea9dba791c