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

Change-Id: I2a8adb8ee167af9b338572c344cbbfe90f8e13e3