b/71650075 Test: Verified by wv unit/integration tests on taimen, compilation on aosp_x86, sdk_gphone_x86 Change-Id: I62c132f1a904e613ce5ea2734822f2d9580d22ef