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

* commit '64724bcca345c0b89bfc0ebd7b6fb2d1c7e9ca96':