Revert "Revert "Fix ROM packaging due to commit https://github.com/AOSPAL/android_build/commit/1add7ac059d5592eb2d521318e57ea3cde8559b3""

This reverts commit cdbd674210d88740a72f4c141d86a48fc1ba8f8b.