am 72760253: am fe685787: Merge "Fix userdebug build."

* commit '72760253f02b9946caf2d0a452d2c8b3b19c8af6':
  Fix userdebug build.