Merge "Use the right layout for inflating Action Bar." into lmp-dev