Merge "Rearrange header libraries"
am: 1d4359f7d4

Change-Id: I2c83f3e18961d7a56dee1d55fb0d0246c4e8fe6c