Revert "mako: track directly from AICP"

This reverts commit da27522c7d64b2ffcf2fdb66269b9134d0671945.

Change-Id: I53db34cd336c8f1fdc5006f8f736736f6651e6ac
Merge "Revert "mako: track directly from AICP"" into jb-mr2