Merge "Don't treat proxy methods as compilable"
am: 9116d5ad10

Change-Id: I02de17eba320396b78b4449edc9ba69296819515