am 0d879513: am 106046ae: Merge "Rename android-L to android-21"

* commit '0d8795135d1c5ddfcba86cf356c53b0a466e58ca':
  Rename android-L to android-21