Merge "Rearrange header libraries" am: 1d4359f7d4
am: 0f86f11e50

Change-Id: I5eadbabbb4e97b4f48702c322a8fa4c655cca7c0