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

Change-Id: I61f1e9ce5dddb710059cb8feba16376d9bb99cbe