Move up to API 21, Lollipop MR1.

Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2 files changed