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

Change-Id: Ie66ae36954b472f7de8eeff74a70f7e50796513d