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

* commit '106046ae9ef3b6a3f6659503f66338d02083d282':
  Rename android-L to android-21