am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app...
am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
* commit 'b33588e1':
Move app-lib definition up for system app scanning