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

* commit '8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':