Revert "Refactor StructCapUser{Header,Data} and StructLinger for API review"

This reverts commit 55c5dd09389efe1fa70ffec4187644c8d4ab4b31.

Revert the class rename in master as discussed in http://b/183513856#comment19,
because the API has landed Android S.

Bug: 183513856
Test: m droid
Change-Id: I1461b7b1dc0bd3761658485db0efb52a546c318d
14 files changed