move override prop & device in releasetools
to test if this fixes zip creation with unified devices
& undo 84ee3e2f492073f0c73467ff094a59600ba40348

Signed-off-by: cj360 <ayunker551@gmail.com>