Merge "add com.android.os.stats to the bootstrap apex"