Merge "Fixes for constant method handles" am: 4dd8880401
am: 5da3b6c6a1

Change-Id: I22f77077e6b2798c08489db2d76f6b2f29c737b0