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

* commit '374712c54f5416e14523eec15456bb8b4372ffac':
  Move up to API 21, Lollipop MR1.