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

* commit '87fa865bea0140b49b5f46e20c64d252e8b91adf':
  Move up to API 21, Lollipop MR1.