Aligned Android configuration together