Merge "Revert^2 "Migrate contexts tests to Android.bp""