Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev