Merge "Move layout_version to /data/misc/installd" am: 24f955155a
am: 95e7252fd8

Change-Id: I49041d4231f364be92d901358496b9b5b93f434d