Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev