Merge "fingerprint: clean up includes" into oc-dev
am: a1a42dffd0

Change-Id: I5b0e864bfb97c44c97f99c50d290abd831c2dc07