Merge "Remove bad make rules causing system.img to rebuild every time"