Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev
am: f85de9616f

Change-Id: I3fbe33f74307dc7d06802263a56b539fef43e006