Revert Android-related changes to atomics

Change-Id: Ic206b30a20217ff9c4083dff3acad91cd2cc5747
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Fix thumb armv5 atomics

Change-Id: Ibcdcba2f33188e847c8ef24c16048f4ce1a2000c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>