Merge "Move clang-generated-headers to a header library"
am: c471b48d6d

Change-Id: I60afda2eee5c15234398601c2ac188e93d0f9b15