Merge "Fix DEX type name for `long`" am: 5051c31aae am: 26b317d35b
am: 17ac1739ae

Change-Id: Ic72d3bb08d512c7bc339e5b50abf025bbb137e18