Merge "Rename 'Basic' ActionBarCompat Sample" into klp-dev