Reorganized packages and swapped "suppress lint" annotations with
@TargetApi ones.