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

Change-Id: I2bf011e4d2a26cb2094234666c4bd24b1f65e39b