Merge "Add required header_libs" am: 04d8813a01 am: 67da76a19d
am: 8526f75455

Change-Id: I0779ce7f24918ddf1c33b67ec732578ec2e3fa09