Merge "Add :frameworks-base-api-current.txt filegroup"