[automerger skipped]Merge "Build: Amend minidebug odex setup" into pi-dev
am: 31524af62a  -s ours

Change-Id: I7c3069485c73ed419e6cc364a1fc2de029d0fa02