Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb