build: Merge upstream changes from LineageOS #25

Closed HridayHS closed 7 years ago