am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix

* commit 'c8b43bc0021aea63858044551f13cae86f4e5699':
  Prevent overflow from MeasureSpec.adjust; measure cache fix