Merge "Revert "Remove custom installation rules""
am: 79734c3265

Change-Id: I1b7b1d3758a589e65ec05ac717ba154e6fcd6d7a