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

Change-Id: Ib9d5223dd891ae7471030bbc41e59f969c5de0a3