am 811fc430: Merge "Update android-L/include/android"

* commit '811fc430bbde6f67fe71c108ca9ad4d683cc9183':
  Update android-L/include/android