Merge "Make ext.jar only dependent on public SDK APIs"