Merge "In theory the package manager now scans /vendor/app" into gingerbread