This actually implements the new dictionary format, but does not activate the implementation through #defines. Bug: 4392433 Change-Id: I9b26b9bcb4b823a36e0984799b69730acfc6f7f3