Merge "[incfs] Skip empty folders for app updates" into rvc-dev am: 26f65631 am: d803fbac am: 97a75e12 am: 6dfc479a Change-Id: I8a1567fe1e5207520d1887954e86a30069c94f6e