Merge "Replace shared_lib with header_lib"
am: 466ec2370b

Change-Id: I1bfcc7ceb26317234161918a4f4d4777940bc2b2