Merge "Changes to render the action bar correctly in ADT." into idea133
 Auto-merge: e988e05

* commit 'e988e0593918f2d493ced9b6cf5c57c9f9686358':
  Changes to render the action bar correctly in ADT.