Android n mr2 preview 1
Add missing "typename". Rename type in macro. am: e9f90a21c0
am: af1af98848

Change-Id: Idf4d4c857917b6163df898ea5cc89f06c84e9359