Merge "Refresh android-L headers (WW40)"