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

Change-Id: I8b8d09a28f0640cffc11228eef662a3ad4380ff8