Merge "fix system app's abi error after uninstall updated version."
am: a863c7f6b7

Change-Id: Ia16d082665b6327586be628e136a52d6510d47a1