Revert "Derp"

This reverts commit f7d28bd1edf4b8acea2f195af5c4039a415e308d.
idk
Revert "PRODUCT_BUILD_PROP_OVERRIDES"

This reverts commit bc88b38e56b34c46bc60419394d21fdb87f09d53.