Work around javac method reference bug
am: a05773a895

Change-Id: Ic1c10d495d89238656055f8d2391b9b5d5387847