Revert "Revert "appcompat""

This reverts commit 9e1373e0ceb0bf9739538203e57eae20633f5436.