Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev