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

Change-Id: I06c3dd58e79ba28faffdced8859aa2ebdd7393cd