Merge "[incremental] create /data/incremental in init.rc" am: a1344fa6d7 am: 2d873010cf

Change-Id: I3d507569e299804f0eec590cb2c5314ac867cb7d