Merge "frameworks/base: Adjust ABI for 3rd party apps"