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

Change-Id: I6989ef04aaf9946dca503b52c17c4e36da2c7762