Merge "Add required header_libs"
am: 04d8813a01

Change-Id: I05768355086391684b951fa1a195b23367d1fb10