yaffs: Integrate Android tree differences