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

Change-Id: Id182ec32d8c46a95e73343b028e4c50e1357306c