Updates for 0.6; set aside a different android-m3-home variable for android-m3 build