Merge "Expose a BaseActivity methods to work around compiler/desugar bug."