mako: Add missing files

Change-Id: I001b8972b8d7fc83b8e877d8b50c8f85606750f9
Fix conflicts after merge upstream/cm-10.2:

Conflicts:
- proprietary-blobs.txt

Change-Id: I0a4f2d51bc2eec585353d9ad6b852647b997f34a