Merge "Move layout_version to /data/misc/installd" am: 7882d92373 am: 09a6914619
am: 2ce5d4796b

Change-Id: I1c991c603f30a73f3278c2c770201aa2e33a533c