Merge "Remove usages of ActionBarActivity." into oc-dev