Sync with CM9 releasetools