Merge "Remove usages of ActionBarActivity." into oc-dev am: 28d5e3ca4a
am: 141883f160

Change-Id: Ie019ef02cbc21517e78e8d053b1e7dfd150889e2
tree: c1b5e8199b5996fc848e7455d04126b9cdbb3c39
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE