Tidy up support-v4 shim APIs pt. 2

Second pass

BUG: 24461189
Change-Id: Ie6a071994c5f22947c6579b8d7a89bc5c521dc02
12 files changed