Mads Sig Ager

Getting started on this work to make sure that we have enough time to clean it up properly. My guess would be that this might break things downstream (IntelliJ/Android Studio)....

Looks good to me. @semoro @udalov could one of you take a look and help land this?