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

* commit '4981bc731888a803a5c6177c2cdebfd2be4d889f':