Merge "Revert "libcore: add definitions from graphics.commons@1.2""