Merge "Update AppCompat styles to M framework" into mnc-dev