Fixes for clang:
PackageInfo is a class, not a struct.
String16 is contained in the android namespace. Do not namespace prefix it
within the android namespace.
Explicitly specify which std classes are necessary to prevent ambiguous
type errors. (map, set)

Change-Id: I0d01477a976e770821ebae8847f8d11b132a15d6
Merge "Fixes for clang: PackageInfo is a class, not a struct. String16 is contained in the android namespace. Do not namespace prefix it within the android namespace. Explicitly specify which std classes are necessary to prevent ambiguous type errors. (map, set)" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1