[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
am: 25d38a56  -s ours

Change-Id: I0bf700a857b7eba5aebf66e0c2f7970234d7ac00