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

Change-Id: If94da5996a9ace28b3bc0f17c33ed8f0b2aadb29