Merge "macros: Add compile-time checking/inferencing for native method registration" am: 6f72bf476d
am: db560a1ae3

Change-Id: I56a955406af38a8497fc04202d57508ae637b52b