am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a

* commit '191d06b55598b653e0764638ca37d8618c9d085e':