am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"

* commit 'ec84ada6e8f3dad738810e2f1cd085defbc6d0ab':
  Update layoutlib method for SystemClock