Merge "Update kernel headers with new parser." am: 688028d7a5
am: 5cb9648867

Change-Id: If4b6de45b637e931bf0bd3e86fa97e10fd4dc71d