Merge "Move framework-appsearch out of framework.jar."