This reverts commit 63d786cf22. These functions will be used for third party OTA zips, so keep them. Change-Id: I24b67ba4c86f8f86d0a41429a395fece1a383efd
63d786cf22
This reverts commit 53c38b1538. Change-Id: Id998923948fb51ef5640c8be8884801c4f8d90e3
53c38b1538
This reverts commit bb7e005a79. Change-Id: Ifcc2234ac9afd50384a6de93e828148bbd1fe077
bb7e005a79