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

Change-Id: I2c19e6a0d3defbaba084a6202e087a344d2e7ea0