Merge "Install (vendor|system/vendor)/build.prop always" am: 1f9af6e54a
am: db3e2cfb2d

Change-Id: I40e46202817e51a4368b298afd43238d3fcba193