am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"

* commit '4217c22daab53ca8867a1eaa26a0aaa69dc33f54':
  Refresh android-L headers (WW40)