Merge "ART: Compiler support for const-method-type" am: 51dda39549
am: 9deca66ff6

Change-Id: Ifc3647b779a133ee30aa783298c3c22f77e6e4c9