revert: Add a few exports required to compile on lollipop