Merge "Move build.prop to ./etc subdir for some partitions"