Merge "add an api for getting a device serial number" into gingerbread