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

Change-Id: Ica9cc9af3c531ced3df627bb7d0a06bd0b59c256