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

Change-Id: Iea121bfaa29e04bbaa9f9bc1747292ff98a824a3