Merge "Add Header Library support to Make" am: 4f794fdd50
am: ea2687fab6

Change-Id: I7b3ba92b8f329df796194fe4f608dab6b935c0bd