[TLBB] Remove some Android stuff
[TLBB] Change back partition table