[automerger skipped] Merge "emmc_optimized means stable_inodes" into rvc-dev am: c05e7c0236 -s ours am: effd821287 -s ours

am skip reason: Change-Id Id7f906564457c240ddf6677dd536698881385385 with SHA-1 e96d6a9067 is in history

Change-Id: I9b446096c815abf7b5426510d3726d2ed6c4197f