tree 50161d18383c4bf12a92b1111400c3ee0564ea71
parent 6d6453076b2bef6d34022da35bb80a9209db3525
parent 0f86f11e504faac46763f35c3a954dad14bf8937
author Colin Cross <ccross@android.com> 1481741208 +0000
committer android-build-merger <android-build-merger@google.com> 1481741208 +0000

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

Change-Id: I5eadbabbb4e97b4f48702c322a8fa4c655cca7c0