Replace "flags" property with "options" with same format as fstab am: f612b8b5ab am: 0ae752dcc3 am: d9261cd394
am: 9c715f4b3a

Change-Id: Iaf3fe220d6405ddcebcf7c4dc7be7f636e68ec8b