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

Change-Id: Idccd0981ca042dd94774db42e47138560ff4a338