Merge "dx: Extend descriptors used for signature polymorphic methods" am: a8b3e6b07e am: 0f0c61b571
am: 9d054450e7

Change-Id: I62bdbdbb4d397bee9598c0866e1e45753044f1c1