Merge "Move layout_version to /data/misc/installd"
am: 7882d92373

Change-Id: I18cef52312e6d8ab5de565301e01fed1f42ac72f