Merge "Update makefies: no 'types'"
am: 4ee5ec1469

Change-Id: I803f6d2f37093477a46a50f429cb265e92acd144