Fix non-deterministic compilation for const-string...
am: 403aafa9f2

Change-Id: I500788ac21cb484747115aa6077d9efe2f69f7b0