Update headers (for export shared lib headers) am: ce9779412a
am: c94c838023

Change-Id: I5ae575fcbc8ae088d9aac1e1fbd74dc54adf3693