Merge "Header library to remove dependence on runtime/" am: 8a346fa6a8
am: 9847dc00c1

Change-Id: I5db32f857d57359502228c8fded8a2483e66edbc