Merge changes I0b1a0979,I4aa89a39

* changes:
  Added AOSP license headers.
  Remove HIDL_GENERATED from things written by hand.