Merge "Update hiddenapi preupload checks to handle new location"