Merge "Convert FrameworksCoreTests to Android.bp" am: 5f912ecd06
am: dc90eebeac

Change-Id: I8fedfd54da2910391763950aaf94825346eb9b6f