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

Change-Id: I3fa099adbe39a85ca6f7bab959d83fe0491935a7