Merge "Update layoutlib method for SystemClock"