Use resolve-startup-const-strings=true for run tests
am: 7cb707ffe4

Change-Id: I05ea2c48751a56c47fa7c080efc9094f19de758f