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

This reverts commit 1906e187e37b78ce6cc532f12b94b9057348b9c8.