Merge "Remove custom installation rules"
am: 598f8c7a77

Change-Id: I1e327966f0c182cc38b0989aff65ba5aaadc6c0a