am 4495a871: Fix secondary builds (AOSP, panda) - do not merge

* commit '4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d':
  Fix secondary builds (AOSP, panda) - do not merge