Merge "fs_mgr: Add stable_inodes flag to encrypted ext4" am: 7df60cee92
am: 955d6cbe2a

Change-Id: I4636441b41e9d97e5f2d5421b690e5bb5c6968ea