mako: Add missing files

Change-Id: I001b8972b8d7fc83b8e877d8b50c8f85606750f9
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2