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

Change-Id: Ieda372a456d778d0bb1b75482133c3580ebc01d7