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

Change-Id: Iaa34aa6b5ff46aa7dbbf0a2cff0f0519513317b2