Merge "emmc_optimized means stable_inodes" am: eb3be2e28f

Change-Id: Ie8f78b314d14f814df5f200a22ecb941bcefd16e