Merge changes Ie78e42b9,Ibf2baa14

* changes:
  Tweaks to fingerprint AIDL
  Reformat biometric interface documentation to 100 cols