Added homebrew packages installs for android reverse engineering.
Rearrange items in mac setup file.
Fix merge conflicts.