Bump version to 1.6.15
am: a0020d26bf  -s ours

Change-Id: I5743eaa08b535a713f43dc84149b5c6c6987f526