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

Change-Id: I651ddd23b861da8faeb77c036523bd8ad794a413