Add s2-common partlayout4nandroid