Merge "Don't treat proxy methods as compilable" am: 9116d5ad10 am: 367cd60733 am: 5060b145a3
am: 13901b922c

Change-Id: I0bdccebf659699cec8d2ca802d67015a36370ccd