[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of...

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a am: d0fcb493 skipped: 93f8bfa5 am: e32e8229 am: f98157e2 am: 4f83bad9 am: a982645d skipped: 9d3e2287 am: 8a095b5f
am: 0886b1a7

Change-Id: I6fb6521317ef9d9e2d6afab056bc8993bed9720c