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

Change-Id: Ib7184fcee32a16036c39ececf2ab736064ecdbec